From 8e49e3c25664f0765df38b0516f5ec179101e5b8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 20 Apr 2011 17:13:08 +0100 Subject: [PATCH] tools: ocaml: tweak whitespace in preparation for autogenerating xl bindings Reduces the diff of existing vs auto-generated code. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/ocaml/libs/xl/xl.ml | 38 +++++++++++++++------------------- tools/ocaml/libs/xl/xl.mli | 37 ++++++++++++++------------------- tools/ocaml/libs/xl/xl_stubs.c | 22 ++++++++++---------- 3 files changed, 44 insertions(+), 53 deletions(-) diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml index e3d4457e57..8b504b494e 100644 --- a/tools/ocaml/libs/xl/xl.ml +++ b/tools/ocaml/libs/xl/xl.ml @@ -64,7 +64,6 @@ module Device_vkb = struct backend_domid : domid; devid : int; } - external add : t -> domid -> unit = "stub_xl_device_vkb_add" external clean_shutdown : domid -> unit = "stub_xl_device_vkb_clean_shutdown" external hard_shutdown : domid -> unit = "stub_xl_device_vkb_hard_shutdown" @@ -77,7 +76,6 @@ module Device_console = struct devid : int; consoletype : console_type; } - external add : t -> domid -> unit = "stub_xl_device_console_add" end @@ -92,7 +90,6 @@ module Device_disk = struct readwrite : bool; is_cdrom : bool; } - external add : t -> domid -> unit = "stub_xl_device_disk_add" external del : t -> domid -> unit = "stub_xl_device_disk_del" end @@ -125,7 +122,6 @@ module Device_pci = struct msitranslate : bool; power_mgmt : bool; } - external add : t -> domid -> unit = "stub_xl_device_pci_add" external remove : t -> domid -> unit = "stub_xl_device_pci_remove" external shutdown : domid -> unit = "stub_xl_device_pci_shutdown" @@ -134,17 +130,17 @@ end module Physinfo = struct type t = { - threads_per_core: int; - cores_per_socket: int; - max_cpu_id: int; - nr_cpus: int; - cpu_khz: int; - total_pages: int64; - free_pages: int64; - scrub_pages: int64; - nr_nodes: int; - hwcap: int32 array; - physcap: int32; + threads_per_core : int; + cores_per_socket : int; + max_cpu_id : int; + nr_cpus : int; + cpu_khz : int; + total_pages : int64; + free_pages : int64; + scrub_pages : int64; + nr_nodes : int; + hwcap : int32 array; + physcap : int32; } external get : unit -> t = "stub_xl_physinfo" @@ -153,8 +149,8 @@ end module Sched_credit = struct type t = { - weight: int; - cap: int; + weight : int; + cap : int; } external domain_get : domid -> t = "stub_xl_sched_credit_domain_get" external domain_set : domid -> t -> unit = "stub_xl_sched_credit_domain_set" @@ -163,11 +159,11 @@ end module Topologyinfo = struct type t = { - core: int; - socket: int; - node: int; + core : int; + socket : int; + node : int; } - external get: unit -> t = "stub_xl_topologyinfo" + external get : unit -> t = "stub_xl_topologyinfo" end external button_press : domid -> button -> unit = "stub_xl_button_press" diff --git a/tools/ocaml/libs/xl/xl.mli b/tools/ocaml/libs/xl/xl.mli index cd83dc1ce3..d52a37174e 100644 --- a/tools/ocaml/libs/xl/xl.mli +++ b/tools/ocaml/libs/xl/xl.mli @@ -64,7 +64,6 @@ module Device_vkb : sig backend_domid : domid; devid : int; } - external add : t -> domid -> unit = "stub_xl_device_vkb_add" external clean_shutdown : domid -> unit = "stub_xl_device_vkb_clean_shutdown" external hard_shutdown : domid -> unit = "stub_xl_device_vkb_hard_shutdown" @@ -92,7 +91,6 @@ module Device_disk : sig readwrite : bool; is_cdrom : bool; } - external add : t -> domid -> unit = "stub_xl_device_disk_add" external del : t -> domid -> unit = "stub_xl_device_disk_del" end @@ -125,7 +123,6 @@ module Device_pci : sig msitranslate : bool; power_mgmt : bool; } - external add : t -> domid -> unit = "stub_xl_device_pci_add" external remove : t -> domid -> unit = "stub_xl_device_pci_remove" external shutdown : domid -> unit = "stub_xl_device_pci_shutdown" @@ -134,29 +131,27 @@ end module Physinfo : sig type t = { - threads_per_core: int; - cores_per_socket: int; - max_cpu_id: int; - nr_cpus: int; - cpu_khz: int; - total_pages: int64; - free_pages: int64; - scrub_pages: int64; - nr_nodes: int; - hwcap: int32 array; - physcap: int32; + threads_per_core : int; + cores_per_socket : int; + max_cpu_id : int; + nr_cpus : int; + cpu_khz : int; + total_pages : int64; + free_pages : int64; + scrub_pages : int64; + nr_nodes : int; + hwcap : int32 array; + physcap : int32; } external get : unit -> t = "stub_xl_physinfo" - end module Sched_credit : sig type t = { - weight: int; - cap: int; + weight : int; + cap : int; } - external domain_get : domid -> t = "stub_xl_sched_credit_domain_get" external domain_set : domid -> t -> unit = "stub_xl_sched_credit_domain_set" end @@ -164,9 +159,9 @@ end module Topologyinfo : sig type t = { - core: int; - socket: int; - node: int; + core : int; + socket : int; + node : int; } external get : unit -> t = "stub_xl_topologyinfo" end diff --git a/tools/ocaml/libs/xl/xl_stubs.c b/tools/ocaml/libs/xl/xl_stubs.c index 7f51477656..ebbf476e97 100644 --- a/tools/ocaml/libs/xl/xl_stubs.c +++ b/tools/ocaml/libs/xl/xl_stubs.c @@ -283,7 +283,7 @@ static value Val_topologyinfo(libxl_topologyinfo *c_val) int i; topologyinfo = caml_alloc_tuple(c_val->coremap.entries); - for (i = 0; i < c_val->coremap.entries; i++) { + for (i = 0; i < c_val->coremap.entries; i++) { v = Val_int(0); /* None */ if (c_val->coremap.array[i] != LIBXL_CPUARRAY_INVALID_ENTRY) { topology = caml_alloc_tuple(3); @@ -398,7 +398,7 @@ value stub_xl_device_vkb_add(value info, value domid) if (ret != 0) failwith_xl("vkb_add", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -413,7 +413,7 @@ value stub_xl_device_vkb_clean_shutdown(value domid) if (ret != 0) failwith_xl("vkb_clean_shutdown", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -428,7 +428,7 @@ value stub_xl_device_vkb_hard_shutdown(value domid) if (ret != 0) failwith_xl("vkb_hard_shutdown", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -446,7 +446,7 @@ value stub_xl_device_vfb_add(value info, value domid) if (ret != 0) failwith_xl("vfb_add", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -461,7 +461,7 @@ value stub_xl_device_vfb_clean_shutdown(value domid) if (ret != 0) failwith_xl("vfb_clean_shutdown", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -476,7 +476,7 @@ value stub_xl_device_vfb_hard_shutdown(value domid) if (ret != 0) failwith_xl("vfb_hard_shutdown", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -494,7 +494,7 @@ value stub_xl_device_pci_add(value info, value domid) if (ret != 0) failwith_xl("pci_add", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -512,7 +512,7 @@ value stub_xl_device_pci_remove(value info, value domid) if (ret != 0) failwith_xl("pci_remove", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -527,7 +527,7 @@ value stub_xl_device_pci_shutdown(value domid) if (ret != 0) failwith_xl("pci_shutdown", &lg); FREE_CTX(); - + CAMLreturn(Val_unit); } @@ -536,7 +536,7 @@ value stub_xl_button_press(value domid, value button) CAMLparam2(domid, button); int ret; INIT_STRUCT(); - + INIT_CTX(); ret = libxl_button_press(ctx, Int_val(domid), Int_val(button) + LIBXL_BUTTON_POWER); if (ret != 0) -- 2.30.2